Simplify utoa macro, make it identical with x86_64 version.

Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S b/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S
index ca1b8591a704706970643ce92a2aaf6ec1955a07..e0c31a0ae0a14c6ba249dea90b208dcee4dedf7f 100644 (file)
--- a/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S
@@ -193,18 +193,14 @@ ENTRY(_stext)
 /*
  * __xen_guest information
  */
-.macro bigutoa value
-       utoa (\value) >> 12
-       .ascii "000"
-.endm
 .macro utoa value
- .if (\value) >= 16
-       utoa (\value) >> 4
+ .if (\value) < 0 || (\value) >= 0x10
+       utoa (((\value)>>4)&0x0fffffff)
  .endif
- .if (\value) % 16 < 10
-  .byte '0' + (\value) % 16
+ .if ((\value) & 0xf) < 10
+  .byte '0' + ((\value) & 0xf)
  .else
-  .byte 'A' + (\value) % 16 - 10
+  .byte 'A' + ((\value) & 0xf) - 10
  .endif
 .endm
 
@@ -212,7 +208,7 @@ ENTRY(_stext)
        .ascii  "GUEST_OS=linux,GUEST_VER=2.6"
        .ascii  ",XEN_VER=xen-3.0"
        .ascii  ",VIRT_BASE=0x"
-                bigutoa __PAGE_OFFSET
+               utoa __PAGE_OFFSET
        .ascii  ",HYPERCALL_PAGE=0x"
                utoa ((__PHYSICAL_START+HYPERCALL_PAGE_OFFSET)>>PAGE_SHIFT)
 #ifdef CONFIG_X86_PAE